Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(server): start grpc server and register services in standalone mode (backport #18110) #18162

Closed
wants to merge 1 commit into from
Closed

feat(server): start grpc server and register services in standalone mode (backport #18110) #18162

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 18, 2023

This is an automatic backport of pull request #18110 done by Mergify.
Cherry-pick of 31f5bc0 has failed:

On branch mergify/bp/release/v0.50.x/pr-18110
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 31f5bc07e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   docs/docs/user/run-node/01-run-node.md
	modified:   server/start.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@p-offtermatt @mergify
feat(server): start grpc server and register services in standalone m…
cbeea06 
…ode (#18110)

Co-authored-by: Marko <marko@baricevic.me>
(cherry picked from commit 31f5bc0)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner October 18, 2023 10:38
@mergify mergify bot added the conflicts label Oct 18, 2023
likhita-809
likhita-809 reviewed Oct 18, 2023
View reviewed changes
Copy link
Contributor

@likhita-809 likhita-809 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hey @p-offtermatt, can you resolve the conflicts on this PR?
since its a backport of your #18110 PR

@p-offtermatt
Copy link
Contributor

I created a new PR for this (since lacking write access I cannot push directly to this PR)
#18163

@tac0turtle tac0turtle closed this Oct 18, 2023
@mergify mergify bot deleted the mergify/bp/release/v0.50.x/pr-18110 branch October 18, 2023 11:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@likhita-809 likhita-809 likhita-809 left review comments

@alexanderbez alexanderbez Awaiting requested review from alexanderbez

Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@p-offtermatt @likhita-809 @tac0turtle